projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4439453
)
label: Avoid creating new attribute list
author
Benjamin Otte
<otte@redhat.com>
Tue, 4 Feb 2014 22:34:06 +0000
(23:34 +0100)
committer
Benjamin Otte
<otte@redhat.com>
Wed, 5 Feb 2014 12:38:54 +0000
(13:38 +0100)
Only create an attribute list for merging if we actually need to merge.
This bug was introduced in
5230cfe805b8f0046896c029612180fc9d4cc5df
gtk/gtklabel.c
patch
|
blob
|
history
diff --git
a/gtk/gtklabel.c
b/gtk/gtklabel.c
index 3a6422cb9504fc802681820ef70684df26a5333b..912342767e859e7d64bfa3cbb04263dd83ee0058 100644
(file)
--- a/
gtk/gtklabel.c
+++ b/
gtk/gtklabel.c
@@
-3361,7
+3361,7
@@
gtk_label_ensure_layout (GtkLabel *label)
pango_attr_list_insert (attrs, attribute);
}
}
- else if (priv->markup_attrs
||
priv->attrs)
+ else if (priv->markup_attrs
&&
priv->attrs)
attrs = pango_attr_list_new ();
else
attrs = NULL;